From: Stefano Stabellini <sstabellini@kernel.org>
Date: Tue, 18 Oct 2016 11:32:50 +0000 (+0100)
Subject: ARM64: fix libxl build, do not include ../../xen/include
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~174
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=9c635883;p=xen.git

ARM64: fix libxl build, do not include ../../xen/include

Do not include ../../xen/include/ to build libxl_arm_acpi.c: header
files clashing against default headers under /usr/include are present in
that directory.

Link only $(XEN_ROOT)/xen/include/acpi under tools/include instead.

Build tested on ARM64 and x86_64.

Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
Tested-by: Steve Capper <steve.capper@linaro.org>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/tools/include/Makefile b/tools/include/Makefile
index dec8b3d352..d95d8375ba 100644
--- a/tools/include/Makefile
+++ b/tools/include/Makefile
@@ -20,6 +20,7 @@ xen/.dir:
 	ln -sf ../xen-sys/$(XEN_OS) xen/sys
 	ln -sf $(addprefix $(XEN_ROOT)/xen/include/xen/,libelf.h elfstructs.h) xen/libelf/
 	ln -s ../xen-foreign xen/foreign
+	ln -s $(XEN_ROOT)/xen/include/acpi acpi
 	touch $@
 
 # Not xen/xsm as that clashes with link to
diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index c4e4117909..dac19ac09b 100644
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -96,7 +96,7 @@ dsdt_anycpu_arm.c:
 	$(MAKE) -C $(ACPI_PATH) ACPI_BUILD_DIR=$(CURDIR)
 
 libxl_arm_acpi.o: libxl_arm_acpi.c
-	$(CC) -c $(CFLAGS) -I../../xen/include/ -o $@ libxl_arm_acpi.c
+	$(CC) -c $(CFLAGS) -o $@ libxl_arm_acpi.c
 else
 LIBXL_OBJS-$(CONFIG_ARM) += libxl_arm_no_acpi.o
 endif